skip attempt to install updates at launch when update checks are disabled

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>

diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index b5f6ad49ddf84c2c4836fac7674d64ecba30f82d..5ea60813011ae7de702f0ae6ffcaa7f2042af3bf 100644 (file)
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -496,6 +496,13 @@ bool NSISUpdater::handleStartup()
 {
     ConfigFile cfg;
     QSettings settings(cfg.configFile(), QSettings::IniFormat);
+
+    // no need to try to install a previously fetched update when the user doesn't want automated updates
+    if (cfg.skipUpdateCheck() || !cfg.autoUpdateCheck()) {
+        qCInfo(lcUpdater) << "Skipping installation of update due to config settings";
+        return false;
+    }
+
     QString updateFileName = settings.value(updateAvailableC).toString();
     // has the previous run downloaded an update?
     if (!updateFileName.isEmpty() && QFile(updateFileName).exists()) {